From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Sat, 15 Aug 2009 13:32:39 +0000 (-0400)
Subject: autoconf-2.64 compat: Don't use $(builddir)
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~11058
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c27b6493d6e7f466f85cfb8addb781929bd14529;p=gnome-shell.git

autoconf-2.64 compat: Don't use $(builddir)

$(builddir) is not a standard automake variable. With autoconf < 2.64
it ends up getting set in every Makefile.in to '.' (because autoconf
defines it), but that is no longer the case for 2.64.

Since $(builddir) was always '.', just use that instead.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index a050e9cd0..6aa76bfb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,7 +173,7 @@ CLEANFILES += Shell-0.1.gir
 # The dependency on libgnome-shell.la here is because g-ir-compiler opens it
 # (not the fake library, since we've already done the rewriting)
 Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir
-	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(builddir) --includedir=$(MUTTER_LIB_DIR)/mutter/ Shell-0.1.gir -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=. --includedir=$(MUTTER_LIB_DIR)/mutter/ Shell-0.1.gir -o $@
 CLEANFILES += Shell-0.1.typelib
 
 Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile